Olaf Klein contributes TourExchangeFormat.

diff --git a/gpsbabel/Makefile b/gpsbabel/Makefile
index b4a763abce31a1abd54782182a94f364cc745f92..e08ef553c25df1ac4c5e7a34200fc2ad87d674d0 100644 (file)
--- a/gpsbabel/Makefile
+++ b/gpsbabel/Makefile
@@ -27,7 +27,8 @@ FMTS=magproto.o gpx.o geo.o mapsend.o mapsource.o garmin_tables.o \
        gpilots.o saroute.o navicache.o psitrex.o geoniche.o delgpl.o \
        ozi.o nmea.o text.o html.o palmdoc.o netstumbler.o hsa_ndv.o \
        igc.o brauniger_iq.o shape.o hiketech.o glogbook.o coastexp.o \
-       vcf.o overlay.o kml.o google.o lowranceusr.o an1.o tomtom.o
+       vcf.o overlay.o kml.o google.o lowranceusr.o an1.o tomtom.o \
+       tef_xml.o
 
 FILTERS=position.o duplicate.o arcdist.o polygon.o smplrout.o reverse_route.o sort.o stackfilter.o
 
@@ -90,8 +91,8 @@ dep:
        (echo -n "internal_styles.c: mkstyle.sh " ; echo style/*.style ; /bin/echo -e '\t./mkstyle.sh > internal_styles.c || (rm -f internal_styles.c ; exit 1)' ) >> /tmp/dep
        echo Edit Makefile and bring in /tmp/dep
 
-VERSIONU=1_2_6-beta04302005c-gsak
-VERSIOND=1.2.6_beta04302005c-gsak
+VERSIONU=1_2_6-beta04302005c-gsak+jamiez
+VERSIOND=1.2.6_beta04302005c-gsak+jamiez
 # VERSIONU=1_2_5
 # VERSIOND=1.2.5
 
@@ -177,6 +178,7 @@ magnav.o: magnav.c defs.h queue.h gbtypes.h coldsync/palm.h \
   coldsync/pdb.h
 magproto.o: magproto.c defs.h queue.h gbtypes.h magellan.h
 main.o: main.c defs.h queue.h gbtypes.h
+tef_xml.o: tef_xml.c defs.h queue.h gbtypes.h xmlgeneric.h
 mapsend.o: mapsend.c defs.h queue.h gbtypes.h mapsend.h magellan.h
 mapsource.o: mapsource.c defs.h queue.h gbtypes.h garmin_tables.h
 mkshort.o: mkshort.c defs.h queue.h gbtypes.h

diff --git a/gpsbabel/README b/gpsbabel/README
index c2a873711fb6afd74b03bf368724f569d5c4f806..101fb43ef6c1c8f32788a943e93b5abfe74ef439 100644 (file)
--- a/gpsbabel/README
+++ b/gpsbabel/README
@@ -772,6 +772,13 @@ THE FORMATS
            2>/dev/null >google_map.js
 
         gpsbabel -i google -f google_map.js -o gpx -F google_map.gpx
+       
+    TourExchangeFormat
+    
+       XML based export format, used by Map&Guide
+       "Motorrad-Routenplaner". This software can only export routing data.
+       So we don't support writing.
+       
 
     AN1
 

diff --git a/gpsbabel/testo b/gpsbabel/testo
index d7541498d58d3f7fab55e1c3f1a6c7f484a1b7de..614df720c518e8ad396de93b5a959e0a0f2d564c 100755 (executable)
--- a/gpsbabel/testo
+++ b/gpsbabel/testo
@@ -686,5 +686,6 @@ ${PNAME} -i geo -f geocaching.loc  -o geo -F ${TMPDIR}/geocustom.out
 # Write something to the various output-only formats
 #
 ${PNAME} -i geo -f geocaching.loc -o text -F ${TMPDIR}/text.out -o html -F ${TMPDIR}/html.out -o vcard -F ${TMPDIR}/vcard.out #-o palmdoc -F ${TMPDIR}/pd.out
+./gpsbabel -i tef -f tef_xml.sample.xml -o gpx -F /dev/null
 
 exit 0

diff --git a/gpsbabel/vecs.c b/gpsbabel/vecs.c
index e85eefc3071dccc0ef28f330ad07c0fe2d468118..1b0a488a83ce259506207d345d0de375a02be40b 100644 (file)
--- a/gpsbabel/vecs.c
+++ b/gpsbabel/vecs.c
@@ -78,6 +78,7 @@ extern ff_vecs_t kml_vecs;
 extern ff_vecs_t google_vecs;
 extern ff_vecs_t an1_vecs;
 extern ff_vecs_t tomtom_vecs;
+extern ff_vecs_t tef_xml_vecs;
 
 static
 vecs_t vec_list[] = {
@@ -370,6 +371,12 @@ vecs_t vec_list[] = {
                "TomTom POI file",
                "ov2"
        },
+       {
+               &tef_xml_vecs,
+               "tef",
+               "Map&Guide 'TourExchangeFormat' XML",
+               "xml"
+       },
        {
                NULL,
                NULL,